From d354d1ec9459f2ee534ed6fbdf178f644a313a09 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 15 Apr 2008 10:21:17 +0100 Subject: [PATCH] [IA64] Fix pci.h include overlap The new upstream xen/pci.h has a name conflict with our modified linux/pci.h and shows up earlier in the include search path. Since our usage of linux/pci.h is limited, rename to linux/linux-pci.h to avoid duplicate names and cleanup the few users. Signed-off-by: Alex Williamson --- xen/arch/ia64/linux-xen/sn/kernel/irq.c | 2 +- xen/include/asm-ia64/linux-xen/asm/sn/README.origin | 1 + xen/include/asm-ia64/linux-xen/asm/sn/pcibr_provider.h | 2 +- xen/include/asm-ia64/{linux => linux-xen}/asm/sn/pcidev.h | 4 ++++ xen/include/asm-ia64/linux-xen/linux/{pci.h => linux-pci.h} | 0 xen/include/asm-ia64/linux/asm/sn/README.origin | 1 - 6 files changed, 7 insertions(+), 3 deletions(-) rename xen/include/asm-ia64/{linux => linux-xen}/asm/sn/pcidev.h (98%) rename xen/include/asm-ia64/linux-xen/linux/{pci.h => linux-pci.h} (100%) diff --git a/xen/arch/ia64/linux-xen/sn/kernel/irq.c b/xen/arch/ia64/linux-xen/sn/kernel/irq.c index 3feeccbd94..acdc996b4e 100644 --- a/xen/arch/ia64/linux-xen/sn/kernel/irq.c +++ b/xen/arch/ia64/linux-xen/sn/kernel/irq.c @@ -12,7 +12,7 @@ #include #include #ifdef XEN -#include +#include #include #endif #include diff --git a/xen/include/asm-ia64/linux-xen/asm/sn/README.origin b/xen/include/asm-ia64/linux-xen/asm/sn/README.origin index 762d1f5a9c..ba80c66319 100644 --- a/xen/include/asm-ia64/linux-xen/asm/sn/README.origin +++ b/xen/include/asm-ia64/linux-xen/asm/sn/README.origin @@ -12,5 +12,6 @@ intr.h -> linux/include/asm-ia64/sn/intr.h io.h -> linux/include/asm-ia64/sn/io.h nodepda.h -> linux/include/asm-ia64/sn/nodepda.h pcibr_provider.h -> linux/include/asm-ia64/sn/pcibr_provider.h +pcidev.h -> linux/include/asm-ia64/sn/pcidev.h rw_mmr.h -> linux/include/asm-ia64/sn/rw_mmr.h types.h -> linux/include/asm-ia64/sn/types.h diff --git a/xen/include/asm-ia64/linux-xen/asm/sn/pcibr_provider.h b/xen/include/asm-ia64/linux-xen/asm/sn/pcibr_provider.h index 8f88ecd3a7..dc953eb2f4 100644 --- a/xen/include/asm-ia64/linux-xen/asm/sn/pcibr_provider.h +++ b/xen/include/asm-ia64/linux-xen/asm/sn/pcibr_provider.h @@ -10,7 +10,7 @@ #ifdef XEN #include -#include +#include #endif #include #include diff --git a/xen/include/asm-ia64/linux/asm/sn/pcidev.h b/xen/include/asm-ia64/linux-xen/asm/sn/pcidev.h similarity index 98% rename from xen/include/asm-ia64/linux/asm/sn/pcidev.h rename to xen/include/asm-ia64/linux-xen/asm/sn/pcidev.h index eac3561574..17ae495e6a 100644 --- a/xen/include/asm-ia64/linux/asm/sn/pcidev.h +++ b/xen/include/asm-ia64/linux-xen/asm/sn/pcidev.h @@ -8,7 +8,11 @@ #ifndef _ASM_IA64_SN_PCI_PCIDEV_H #define _ASM_IA64_SN_PCI_PCIDEV_H +#ifdef XEN +#include +#else #include +#endif /* * In ia64, pci_dev->sysdata must be a *pci_controller. To provide access to diff --git a/xen/include/asm-ia64/linux-xen/linux/pci.h b/xen/include/asm-ia64/linux-xen/linux/linux-pci.h similarity index 100% rename from xen/include/asm-ia64/linux-xen/linux/pci.h rename to xen/include/asm-ia64/linux-xen/linux/linux-pci.h diff --git a/xen/include/asm-ia64/linux/asm/sn/README.origin b/xen/include/asm-ia64/linux/asm/sn/README.origin index 7a4f1c645d..495171ee81 100644 --- a/xen/include/asm-ia64/linux/asm/sn/README.origin +++ b/xen/include/asm-ia64/linux/asm/sn/README.origin @@ -10,7 +10,6 @@ l1.h -> linux/include/asm-ia64/sn/l1.h leds.h -> linux/include/asm-ia64/sn/leds.h module.h -> linux/include/asm-ia64/sn/module.h pcibus_provider_defs.h -> linux/include/asm-ia64/sn/pcibus_provider_defs.h -pcidev.h -> linux/include/asm-ia64/sn/pcidev.h pda.h -> linux/include/asm-ia64/sn/pda.h pic.h -> linux/include/asm-ia64/sn/pic.h shub_mmr.h -> linux/include/asm-ia64/sn/shub_mmr.h -- 2.30.2